Auto merge of #1847 - steveklabnik:gh1707, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 27 Jul 2015 23:18:25 +0000 (23:18 +0000)
committerbors <bors@rust-lang.org>
Mon, 27 Jul 2015 23:18:25 +0000 (23:18 +0000)
Fixes #1707


Trivial merge